Skip to content

server: allow dedicate ip range to a domain if ips are used by an account in the domain#3206

Merged
yadvr merged 1 commit intoapache:4.11from
ustcweizhou:bugfix/allow-dedicate-ip-to-domain-account-if-ip-is-used
May 31, 2019
Merged

server: allow dedicate ip range to a domain if ips are used by an account in the domain#3206
yadvr merged 1 commit intoapache:4.11from
ustcweizhou:bugfix/allow-dedicate-ip-to-domain-account-if-ip-is-used

Conversation

@ustcweizhou
Copy link
Contributor

@ustcweizhou ustcweizhou commented Mar 8, 2019

when we dedicate public ip range to a domain but some ips are used by an account in the domain,
the operation should be allowed but actually fails for now.
It is because cloudstack check if ips are used by same account by account name,
However, accountName is null when dedicate public ip range to a domain.

Modify the code to check account id only when dedicate ip range to account.

Description

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

@ustcweizhou
server: allow dedicate ip range to a domain if ips are used by an acc…
9089761 
…out in the domain

when we dedicate public ip range to a domain but some ips are used by an account in the domain,
the operation should be allowed but actually fails for now.
It is because cloudstack check if ips are used by same account by account name,
However, accountName is null when dedicate public ip range to a domain.

Modify the code to check account id only when dedicate ip range to account.
yadvr
yadvr approved these changes Mar 12, 2019
View reviewed changes
Copy link
Member

@yadvr yadvr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not test myself, but LGTM

@yadvr yadvr added this to the 4.11.3.0 milestone May 27, 2019
@yadvr
Copy link
Member

yadvr commented May 27, 2019

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented May 27, 2019

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented May 27, 2019

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2792

@yadvr
Copy link
Member

yadvr commented May 30, 2019

@blueorangutan test

@yadvr
Copy link
Member

yadvr commented May 30, 2019

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented May 30, 2019

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

nvazquez
nvazquez approved these changes May 30, 2019
View reviewed changes
Copy link
Contributor

@nvazquez nvazquez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM, subject to testing

@blueorangutan
Copy link

blueorangutan commented May 31, 2019

Trillian test result (tid-3619)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41646 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3206-t3619-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 63 look OK, 5 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_04_extract_template Failure 128.41 test_templates.py
ContextSuite context=TestISOUsage>:setup Error 0.00 test_usage.py
test_06_download_detached_volume Failure 136.70 test_volumes.py
test_05_rvpc_multi_tiers Failure 409.32 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 434.65 test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn Failure 262.54 test_vpc_vpn.py

@yadvr yadvr merged commit b8522c9 into apache:4.11 May 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes

@nvazquez nvazquez nvazquez approved these changes

@andrijapanicsb andrijapanicsb Awaiting requested review from andrijapanicsb

@borisstoyanov borisstoyanov Awaiting requested review from borisstoyanov

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.11.3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@ustcweizhou @yadvr @blueorangutan @nvazquez